Merge tag 'upstream/2016.7' into debian/master
authorSimon McVittie <smcv@debian.org>
Sat, 16 Jul 2016 20:06:36 +0000 (21:06 +0100)
committerSimon McVittie <smcv@debian.org>
Sat, 16 Jul 2016 20:06:36 +0000 (21:06 +0100)
commit902c4c7b0fc1c1983b70dcf5683592017d721aa9
treea5758636e7c43753f1a14c9f7ff18f087e15334a
parente8a3585d7805e4c29d9c4ae4ab82e557ace569b6
parent8d0c193392d0e895f3a5b65fb96a26897f1b0837
Merge tag 'upstream/2016.7' into debian/master

Upstream version 2016.7